gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting

of use_text_format to the end of the function. (#56447)

diff --git a/ChangeLog b/ChangeLog
index 8fc758f41c07db5102124f4a4b856cfebc450746..e34b7a1c215a4b530add4b007852c000eab24bb6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 28 21:00:44 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting
+       of use_text_format to the end of the function. (#56447)
+
 Tue Aug 28 20:06:07 2001  Matthias Clasen  <matthiasc@poet.de>
 
        * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8fc758f41c07db5102124f4a4b856cfebc450746..e34b7a1c215a4b530add4b007852c000eab24bb6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Tue Aug 28 21:00:44 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting
+       of use_text_format to the end of the function. (#56447)
+
 Tue Aug 28 20:06:07 2001  Matthias Clasen  <matthiasc@poet.de>
 
        * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8fc758f41c07db5102124f4a4b856cfebc450746..e34b7a1c215a4b530add4b007852c000eab24bb6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Aug 28 21:00:44 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting
+       of use_text_format to the end of the function. (#56447)
+
 Tue Aug 28 20:06:07 2001  Matthias Clasen  <matthiasc@poet.de>
 
        * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8fc758f41c07db5102124f4a4b856cfebc450746..e34b7a1c215a4b530add4b007852c000eab24bb6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue Aug 28 21:00:44 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting
+       of use_text_format to the end of the function. (#56447)
+
 Tue Aug 28 20:06:07 2001  Matthias Clasen  <matthiasc@poet.de>
 
        * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8fc758f41c07db5102124f4a4b856cfebc450746..e34b7a1c215a4b530add4b007852c000eab24bb6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Aug 28 21:00:44 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting
+       of use_text_format to the end of the function. (#56447)
+
 Tue Aug 28 20:06:07 2001  Matthias Clasen  <matthiasc@poet.de>
 
        * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8fc758f41c07db5102124f4a4b856cfebc450746..e34b7a1c215a4b530add4b007852c000eab24bb6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Aug 28 21:00:44 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting
+       of use_text_format to the end of the function. (#56447)
+
 Tue Aug 28 20:06:07 2001  Matthias Clasen  <matthiasc@poet.de>
 
        * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8fc758f41c07db5102124f4a4b856cfebc450746..e34b7a1c215a4b530add4b007852c000eab24bb6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Aug 28 21:00:44 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting
+       of use_text_format to the end of the function. (#56447)
+
 Tue Aug 28 20:06:07 2001  Matthias Clasen  <matthiasc@poet.de>
 
        * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf

diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index 6e0f8441f28b1e42419cb1b83d2499220f8e3b51..5e9ebc387ed995004894fa0be3999ec267a5b4f1 100644 (file)
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -907,9 +907,6 @@ gtk_progress_bar_set_text (GtkProgressBar *pbar,
 {
   g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
   
-  /* We don't support formats in this interface */
-  GTK_PROGRESS (pbar)->use_text_format = FALSE;
-  
   if (text && *text)
     {
       gtk_progress_set_show_text (GTK_PROGRESS (pbar), TRUE);
@@ -921,6 +918,9 @@ gtk_progress_bar_set_text (GtkProgressBar *pbar,
       gtk_progress_set_format_string (GTK_PROGRESS (pbar), "");
     }
 
+  /* We don't support formats in this interface */
+  GTK_PROGRESS (pbar)->use_text_format = FALSE;
+  
   g_object_notify (G_OBJECT (pbar), "text");
 }